From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 14 Dec 2023 13:28:26 +0000 (+0000)
Subject: disable conflicting include.
X-Git-Tag: archive/raspbian/115.9.1esr-1_deb12u1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eaaa03e0dda608e89170ab30f89e9557e770e72c;p=firefox-esr.git

disable conflicting include.


Gbp-Pq: Name disable-conflicting-include.patch
---

diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
index df7c049dfac..d580387efdc 100644
--- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
+++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
@@ -6,9 +6,9 @@
 
 #include "jit/AtomicOperations.h"
 
-#if defined(__arm__)
-#  include "jit/arm/Architecture-arm.h"
-#endif
+//#if defined(__arm__)
+//#  include "jit/arm/Architecture-arm.h"
+//#endif
 
 #ifdef JS_HAVE_GENERATED_ATOMIC_OPS